diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index dbe598b..403ab1d 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -65,4 +65,3 @@
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_USB_TTY) += usbtty.o
 endif
-obj-$(CONFIG_UART4_SERIAL) += serial_adi_uart4.o
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 3f706e1..9e39da7 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -4,6 +4,7 @@
  * Scott McNutt <smcnutt@psyent.com>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <serial.h>
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 3c13ef2..3592048 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -4,6 +4,7 @@
  * Scott McNutt <smcnutt@psyent.com>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <serial.h>
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 66af136..a402a12 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -15,6 +15,7 @@
  * this file might be covered by the GNU General Public License.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <serial.h>
 
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 7e45a80..9827c00 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -5,6 +5,7 @@
  * Modified to support C structur SoC access by
  * Andreas Bießmann <biessmann@corscience.de>
  */
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 4963385..6deb1d8 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -5,7 +5,7 @@
  */
 
 #include <clock_legacy.h>
-#include <config.h>
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index ec0068e..f6ac3d2 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -9,6 +9,7 @@
  * U-Boot.
  */
 
+#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <os.h>
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 84f02f7..e4fa393 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -5,7 +5,7 @@
 
 #define LOG_CATEGORY UCLASS_SERIAL
 
-#include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <env_internal.h>
 #include <errno.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index dc4bb06..787edd5 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -4,7 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <config.h>
+#include <common.h>
 #include <env_internal.h>
 #include <hang.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_adi_uart4.c b/drivers/serial/serial_adi_uart4.c
deleted file mode 100644
index 45f8315..0000000
--- a/drivers/serial/serial_adi_uart4.c
+++ /dev/null
@@ -1,225 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * (C) Copyright 2022 - Analog Devices, Inc.
- *
- * Written and/or maintained by Timesys Corporation
- *
- * Converted to driver model by Nathan Barrett-Morrison
- *
- * Contact: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
- * Contact: Greg Malysa <greg.malysa@timesys.com>
- *
- */
-
-#include <clk.h>
-#include <dm.h>
-#include <serial.h>
-#include <asm/io.h>
-#include <dm/device_compat.h>
-#include <linux/bitops.h>
-
-/*
- * UART4 Masks
- */
-
-/* UART_CONTROL */
-#define UEN			BIT(0)
-#define LOOP_ENA		BIT(1)
-#define UMOD			(3 << 4)
-#define UMOD_UART		(0 << 4)
-#define UMOD_MDB		BIT(4)
-#define UMOD_IRDA		BIT(4)
-#define WLS			(3 << 8)
-#define WLS_5			(0 << 8)
-#define WLS_6			BIT(8)
-#define WLS_7			(2 << 8)
-#define WLS_8			(3 << 8)
-#define STB			BIT(12)
-#define STBH			BIT(13)
-#define PEN			BIT(14)
-#define EPS			BIT(15)
-#define STP			BIT(16)
-#define FPE			BIT(17)
-#define FFE			BIT(18)
-#define SB			BIT(19)
-#define FCPOL			BIT(22)
-#define RPOLC			BIT(23)
-#define TPOLC			BIT(24)
-#define MRTS			BIT(25)
-#define XOFF			BIT(26)
-#define ARTS			BIT(27)
-#define ACTS			BIT(28)
-#define RFIT			BIT(29)
-#define RFRT			BIT(30)
-
-/* UART_STATUS */
-#define DR			BIT(0)
-#define OE			BIT(1)
-#define PE			BIT(2)
-#define FE			BIT(3)
-#define BI			BIT(4)
-#define THRE			BIT(5)
-#define TEMT			BIT(7)
-#define TFI			BIT(8)
-#define ASTKY			BIT(9)
-#define ADDR			BIT(10)
-#define RO			BIT(11)
-#define SCTS			BIT(12)
-#define CTS			BIT(16)
-#define RFCS			BIT(17)
-
-/* UART_EMASK */
-#define ERBFI			BIT(0)
-#define ETBEI			BIT(1)
-#define ELSI			BIT(2)
-#define EDSSI			BIT(3)
-#define EDTPTI			BIT(4)
-#define ETFI			BIT(5)
-#define ERFCI			BIT(6)
-#define EAWI			BIT(7)
-#define ERXS			BIT(8)
-#define ETXS			BIT(9)
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct uart4_reg {
-	u32 revid;
-	u32 control;
-	u32 status;
-	u32 scr;
-	u32 clock;
-	u32 emask;
-	u32 emaskst;
-	u32 emaskcl;
-	u32 rbr;
-	u32 thr;
-	u32 taip;
-	u32 tsr;
-	u32 rsr;
-	u32 txdiv_cnt;
-	u32 rxdiv_cnt;
-};
-
-struct adi_uart4_platdata {
-	// Hardware registers
-	struct uart4_reg *regs;
-
-	// Enable divide-by-one baud rate setting
-	bool edbo;
-};
-
-static int adi_uart4_set_brg(struct udevice *dev, int baudrate)
-{
-	struct adi_uart4_platdata *plat = dev_get_plat(dev);
-	struct uart4_reg *regs = plat->regs;
-	u32 divisor, uart_base_clk_rate;
-	struct clk uart_base_clk;
-
-	if (clk_get_by_index(dev, 0, &uart_base_clk)) {
-		dev_err(dev, "Could not get UART base clock\n");
-		return -1;
-	}
-
-	uart_base_clk_rate = clk_get_rate(&uart_base_clk);
-
-	if (plat->edbo) {
-		u16 divisor16 = (uart_base_clk_rate + (baudrate / 2)) / baudrate;
-
-		divisor = divisor16 | BIT(31);
-	} else {
-		// Divisor is only 16 bits
-		divisor = 0x0000ffff & ((uart_base_clk_rate + (baudrate * 8)) / (baudrate * 16));
-	}
-
-	writel(divisor, &regs->clock);
-	return 0;
-}
-
-static int adi_uart4_pending(struct udevice *dev, bool input)
-{
-	struct adi_uart4_platdata *plat = dev_get_plat(dev);
-	struct uart4_reg *regs = plat->regs;
-
-	if (input)
-		return (readl(&regs->status) & DR) ? 1 : 0;
-	else
-		return (readl(&regs->status) & THRE) ? 0 : 1;
-}
-
-static int adi_uart4_getc(struct udevice *dev)
-{
-	struct adi_uart4_platdata *plat = dev_get_plat(dev);
-	struct uart4_reg *regs = plat->regs;
-	int uart_rbr_val;
-
-	if (!adi_uart4_pending(dev, true))
-		return -EAGAIN;
-
-	uart_rbr_val = readl(&regs->rbr);
-	writel(-1, &regs->status);
-
-	return uart_rbr_val;
-}
-
-static int adi_uart4_putc(struct udevice *dev, const char ch)
-{
-	struct adi_uart4_platdata *plat = dev_get_plat(dev);
-	struct uart4_reg *regs = plat->regs;
-
-	if (adi_uart4_pending(dev, false))
-		return -EAGAIN;
-
-	writel(ch, &regs->thr);
-	return 0;
-}
-
-static const struct dm_serial_ops adi_uart4_serial_ops = {
-	.setbrg = adi_uart4_set_brg,
-	.getc = adi_uart4_getc,
-	.putc = adi_uart4_putc,
-	.pending = adi_uart4_pending,
-};
-
-static int adi_uart4_of_to_plat(struct udevice *dev)
-{
-	struct adi_uart4_platdata *plat = dev_get_plat(dev);
-	fdt_addr_t addr;
-
-	addr = dev_read_addr(dev);
-	if (addr == FDT_ADDR_T_NONE)
-		return -EINVAL;
-
-	plat->regs = (struct uart4_reg *)addr;
-	plat->edbo = dev_read_bool(dev, "adi,enable-edbo");
-
-	return 0;
-}
-
-static int adi_uart4_probe(struct udevice *dev)
-{
-	struct adi_uart4_platdata *plat = dev_get_plat(dev);
-	struct uart4_reg *regs = plat->regs;
-
-	/* always enable UART to 8-bit mode */
-	writel(UEN | UMOD_UART | WLS_8, &regs->control);
-
-	writel(-1, &regs->status);
-
-	return 0;
-}
-
-static const struct udevice_id adi_uart4_serial_ids[] = {
-	{ .compatible = "adi,uart4" },
-	{ }
-};
-
-U_BOOT_DRIVER(serial_adi_uart4) = {
-	.name = "serial_adi_uart4",
-	.id = UCLASS_SERIAL,
-	.of_match = adi_uart4_serial_ids,
-	.of_to_plat = adi_uart4_of_to_plat,
-	.plat_auto = sizeof(struct adi_uart4_platdata),
-	.probe = adi_uart4_probe,
-	.ops = &adi_uart4_serial_ops,
-	.flags = DM_FLAG_PRE_RELOC,
-};
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 4d92752..4f91634 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
  */
 
+#include <common.h>
 #include <clock_legacy.h>
 #include <dm.h>
 #include <div64.h>
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index c0930cf..c2fc8a9 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -7,6 +7,7 @@
  *
  */
 
+#include <common.h>
 #include <dm.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 7fa2624..7585f79 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -14,6 +14,7 @@
 
 /* Simple U-Boot driver for the BCM283x mini UART */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <watchdog.h>
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 2abc1c4..09a9868 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2018 Alexander Graf <agraf@suse.de>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
index b1f69f6..23066e4 100644
--- a/drivers/serial/serial_coreboot.c
+++ b/drivers/serial/serial_coreboot.c
@@ -7,6 +7,7 @@
 
 #define LOG_CATGEGORY	UCLASS_SERIAL
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <ns16550.h>
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index 3ae8fb4..6dc81a7 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <watchdog.h>
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 5733eaaf..0067576 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -4,6 +4,7 @@
  * Written by Simon Glass <sjg@chromium.org>
  */
 
+#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <efi.h>
diff --git a/drivers/serial/serial_htif.c b/drivers/serial/serial_htif.c
index 2a93bbb..5d2bf0a 100644
--- a/drivers/serial/serial_htif.c
+++ b/drivers/serial/serial_htif.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2022 Ventana Micro Systems Inc.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c
index 4b528e4..bbf1905 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2017 Intel Corporation
  */
 
+#include <common.h>
 #include <dm.h>
 #include <ns16550.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index ff66e69..b449e55 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2013-2016 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <watchdog.h>
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index a06e6dc..3f2be72 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -4,6 +4,7 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <clock_legacy.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 7614357..bb2afd0 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -15,6 +15,7 @@
  * as serial console interface.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/serial_coldfire.h>
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index bb79b97..be5f380 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 9ce3fc3..d82760c 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -4,6 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
+#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 757e5ea..a472e0b 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -8,6 +8,7 @@
  * Based on Linux driver.
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c
index cb6c09f..5260474 100644
--- a/drivers/serial/serial_msm_geni.c
+++ b/drivers/serial/serial_msm_geni.c
@@ -9,6 +9,7 @@
 
 #include <asm/io.h>
 #include <clk.h>
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 3f569c6..f146f2b 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -7,7 +7,7 @@
  */
 
 #include <clk.h>
-#include <config.h>
+#include <common.h>
 #include <div64.h>
 #include <dm.h>
 #include <dm/device_compat.h>
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index 1a0b85e..b2017c6 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Pali Rohár <pali@kernel.org>
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index c5fd740..cc85a50 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -3,6 +3,7 @@
  * (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <watchdog.h>
diff --git a/drivers/serial/serial_mxs.c b/drivers/serial/serial_mxs.c
index 071bd09..3659948 100644
--- a/drivers/serial/serial_mxs.c
+++ b/drivers/serial/serial_mxs.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (C) 2023 Marek Vasut <marex@denx.de>
  */
+#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_npcm.c b/drivers/serial/serial_npcm.c
index 661daf1..6bf3a94 100644
--- a/drivers/serial/serial_npcm.c
+++ b/drivers/serial/serial_npcm.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2021 Nuvoton Technology Corp.
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 577864b..4014f68 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -4,7 +4,7 @@
  * Rob Taylor, Flying Pig Systems. robt@flyingpig.com.
  */
 
-#include <config.h>
+#include <common.h>
 #include <clock_legacy.h>
 #include <ns16550.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c
index 78a9e0b..f3ca7f5 100644
--- a/drivers/serial/serial_nulldev.c
+++ b/drivers/serial/serial_nulldev.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2015 National Instruments
  */
 
+#include <common.h>
 #include <dm.h>
 #include <serial.h>
 
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index 9467265..49ced8f 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -6,7 +6,7 @@
  *	Lokesh Vutla <lokeshvutla@ti.com>
  */
 
-#include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <log.h>
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 8ce8aa3..3b79578 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index a49c413..0a03a9a 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -3,6 +3,7 @@
  * (c) 2015 Paul Thacker <paul.thacker@microchip.com>
  *
  */
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 80c3596..f04c21e 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -10,6 +10,7 @@
 
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
+#include <common.h>
 #include <asm/global_data.h>
 /* For get_bus_freq() */
 #include <clock_legacy.h>
diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
index 8a15173..f4e9422 100644
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2015 Google, Inc
  */
 
+#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <dt-structs.h>
diff --git a/drivers/serial/serial_s5p4418_pl011.c b/drivers/serial/serial_s5p4418_pl011.c
index 1fb954e..e4492e6 100644
--- a/drivers/serial/serial_s5p4418_pl011.c
+++ b/drivers/serial/serial_s5p4418_pl011.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2022  Stefan Bosch <stefan_b@posteo.net>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/reset.h>
diff --git a/drivers/serial/serial_semihosting.c b/drivers/serial/serial_semihosting.c
index 56a5ec7..cfa1ec3 100644
--- a/drivers/serial/serial_semihosting.c
+++ b/drivers/serial/serial_semihosting.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2022 Sean Anderson <sean.anderson@seco.com>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index e47828e..c449f3f 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018 Anup Patel <anup@brainfault.org>
  */
 
+#include <common.h>
 #include <clk.h>
 #include <debug_uart.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index ef68e58..40381b5 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -6,6 +6,7 @@
  * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 1ee5814..fb03954 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -6,6 +6,7 @@
 
 #define LOG_CATEGORY UCLASS_SERIAL
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index a566ba7..27e4b92 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_xen.c b/drivers/serial/serial_xen.c
index e05805f..ab318b0 100644
--- a/drivers/serial/serial_xen.c
+++ b/drivers/serial/serial_xen.c
@@ -3,6 +3,7 @@
  * (C) 2018 NXP
  * (C) 2020 EPAM Systems Inc.
  */
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index eb23410..35df413 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -8,6 +8,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 55f13c0..1847d1f 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -5,6 +5,7 @@
  */
 
 #include <clk.h>
+#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index ae3ac80..ecb6ba8 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -7,6 +7,7 @@
  * Bryan O'Donoghue, bodonoghue@codehermit.ie
  */
 
+#include <common.h>
 #include <config.h>
 #include <circbuf.h>
 #include <env.h>